bitkeeper revision 1.1159.183.27 (41aa44f3iF3qcxWmwksREsxiA7dgDA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 28 Nov 2004 21:36:51 +0000 (21:36 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 28 Nov 2004 21:36:51 +0000 (21:36 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk


Trivial merge